Drop the error trap vfuncs

No longer used.

diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index 96f281404118dfb3d2d4aa1121a80067976acbd1..f2927ab6d015fbdc3da5471b56fca0923a285145 100644 (file)
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -164,9 +164,6 @@ struct _GdkDisplayClass
                                                     GdkWindowAttr *attributes);
 
   GdkKeymap *                (*get_keymap)         (GdkDisplay    *display);
-  void                       (*push_error_trap)    (GdkDisplay    *display);
-  gint                       (*pop_error_trap)     (GdkDisplay    *display,
-                                                    gboolean       ignore);
 
   GdkWindow *                (*get_selection_owner) (GdkDisplay   *display,
                                                      GdkAtom       selection);

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index d8dc8cb305f22b09d9f3aaa8710849d6750ce714..c6063ea3f1e0ecc7fee0e67418ce1373901cd963 100644 (file)
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -937,18 +937,6 @@ _gdk_wayland_display_get_keymap (GdkDisplay *display)
   return tmp_keymap;
 }
 
-static void
-gdk_wayland_display_push_error_trap (GdkDisplay *display)
-{
-}
-
-static gint
-gdk_wayland_display_pop_error_trap (GdkDisplay *display,
-                                   gboolean    ignored)
-{
-  return 0;
-}
-
 static int
 gdk_wayland_display_get_n_monitors (GdkDisplay *display)
 {
@@ -1037,8 +1025,6 @@ gdk_wayland_display_class_init (GdkWaylandDisplayClass *class)
   display_class->notify_startup_complete = gdk_wayland_display_notify_startup_complete;
   display_class->create_window_impl = _gdk_wayland_display_create_window_impl;
   display_class->get_keymap = _gdk_wayland_display_get_keymap;
-  display_class->push_error_trap = gdk_wayland_display_push_error_trap;
-  display_class->pop_error_trap = gdk_wayland_display_pop_error_trap;
   display_class->get_selection_owner = _gdk_wayland_display_get_selection_owner;
   display_class->set_selection_owner = _gdk_wayland_display_set_selection_owner;
   display_class->send_selection_notify = _gdk_wayland_display_send_selection_notify;

diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index bdcfa667bad9c489ea26e0b62b891596e36bebcd..e23fd25bb3b07ad2d3d14727e65a5ce5ccdea729 100644 (file)
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -1086,19 +1086,6 @@ gdk_win32_display_notify_startup_complete (GdkDisplay  *display,
   /* nothing */
 }
 
-static void
-gdk_win32_display_push_error_trap (GdkDisplay *display)
-{
-  /* nothing */
-}
-
-static gint
-gdk_win32_display_pop_error_trap (GdkDisplay *display,
-                                 gboolean    ignored)
-{
-  return 0;
-}
-
 static int
 gdk_win32_display_get_n_monitors (GdkDisplay *display)
 {
@@ -1262,8 +1249,6 @@ gdk_win32_display_class_init (GdkWin32DisplayClass *klass)
   display_class->create_window_impl = _gdk_win32_display_create_window_impl;
 
   display_class->get_keymap = _gdk_win32_display_get_keymap;
-  display_class->push_error_trap = gdk_win32_display_push_error_trap;
-  display_class->pop_error_trap = gdk_win32_display_pop_error_trap;
   display_class->get_selection_owner = _gdk_win32_display_get_selection_owner;
   display_class->set_selection_owner = _gdk_win32_display_set_selection_owner;
   display_class->send_selection_notify = _gdk_win32_display_send_selection_notify;

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index cdca966220f157517289e0edc02dcb8b736fd343..d35e5089202e842e4a38c4b23cac2b29c1d7240b 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -3051,21 +3051,6 @@ gdk_x11_display_get_screen (GdkDisplay *display)
   return GDK_X11_DISPLAY (display)->screen;
 }
 
-static gint
-pop_error_trap (GdkDisplay *display,
-                gboolean    ignored)
-{
-  if (ignored)
-    {
-      gdk_x11_display_error_trap_pop_ignored (display);
-      return Success;
-    }
-  else
-    {
-      return gdk_x11_display_error_trap_pop (display);
-    }
-}
-
 static GdkKeymap *
 gdk_x11_display_get_keymap (GdkDisplay *display)
 {
@@ -3218,8 +3203,6 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
   display_class->notify_startup_complete = gdk_x11_display_notify_startup_complete;
   display_class->create_window_impl = _gdk_x11_display_create_window_impl;
   display_class->get_keymap = gdk_x11_display_get_keymap;
-  display_class->push_error_trap = gdk_x11_display_error_trap_push;
-  display_class->pop_error_trap = pop_error_trap;
   display_class->get_selection_owner = _gdk_x11_display_get_selection_owner;
   display_class->set_selection_owner = _gdk_x11_display_set_selection_owner;
   display_class->send_selection_notify = _gdk_x11_display_send_selection_notify;